More schema work - looking OK right now