Refactored common object and implemented CommonRepository