Refactor configuration schema