Updated the Entity rule in the dsl, made the extends feature optional: