Moved to impl