Added abstract entities
Formatted code