Resolve properties
Fix entity context