Updated schemas for more configurability.