Add GEL classes and minor modifications to Alpha