Feature/fix json loading