More functionality and documentation