Checking in changes for model to generate some tables