Simplyfied the API, that is removed unnecessary then methods from the interface and modfied tests accordingly