Added comment support to models