Added more functionality, documentation