Cleaned up stack generation and schema route