Updated documentation, added delegate methods