Replacing guava collection utilities by core java 8 stream API.
Added enums and Class suport to concrete annotation.