Adding groovy class support
Removed any discovery based logic - this can now easily be resolved using state resolvers..