Agts/additional fix schemas