Add schemas code

Removed commented out code.