Changed code for java 7;
Interface renaming;