Splitted classes for multiple java versions. Added Java6