Add information in comments and fix model imports