Better option handling in constructor
Fixed setter, split entity and route identifiers