better entities and scope validation
new optional detach