More modular EntityHelper