Change the DSL from lamdas to Annotations

Now it is target to java 7+