Make entity id configurable