Add schemas code, second attempt.

removed unused imports