Feature/mason frag improvements