Moved replicated code to base super class