Moved non-interface methods to impl