Feature/3310 add support for multiple schemas

Closes #3310.