Added all the hardcoded values to dev branch