Merge "Refactor for Better Resource Management"