Updated the code so that it works better with the new schema