Added some more master creation functionality