Removed custom lib and added common libaries and made changes to how we deal with raw json objects