Refactoring common objects