Supporting classes added