updated consolidated schema