Started to add server side schema support