Added a macro for easy entity type selection