Added more doc comments