Moving schema out of handler