Added schema builder support