Feature/fix ajson model

done