Add support for genitive case support in some places