Moved comments load to existing model function