Task 1 - entity syntax added (with some ignores for generated source)