More class seperation