Model bean extension cleanup and refactoring