Fix include issue for imports. Cleaned up schema lookup.