Master form creation is now lazy