Cleaned code
More entity macros