More refactoring. Added support for micros and microsplus