V1.1: Added comments to entities