Moved attributes into their own module, added multi match query