Add support for user field