Added on more schemaa