Add JSONSchema support + router fixes