Separate createContext and rebuild step