EPD-190: Work on incorporating new settings classes in EPD Shore