Feature/mason2 update