Added some extra matches for new environments