Modifying some interfaces and documentation