Trying to complete schema handling