Added brief template entity
Clean up