Fixed schema imports