Added support for multiple fields :)