made code a bit more cleaner; added support of primitive wrappers collections;