Added wrapper class for ASs
Optimized code