Moved to returning ‘instancetype’ in factory methods