Added some groovy syntax sugar