Modify to Singelton patern and add jsondecode