Updated the handler to have the entity id param builder in the set of
builders by default