Added resolving of struct key fields.