Moved implementation to correct file