Added class picker