Working on adding support for multiple values