Expanded documentation, more handlers