Reworked service and documentation