Override clone method to perform model specific actions (FELIX-2152) also some minor code refactoring to move all overridden methods to one block of code