Renamed interface and added javadocs