Add improved context creation supporting multiple models if needed

TODO: real dynamic creation based on fields, not on static definition