Changed the classes for better ASAWoO implem