Should this be a resolveModelAttribute?