Add some more plugins and support for mason