Downgrade Schema dependency

Reverting schema dependency to previous values.