Worked out master class to not need hash