Adding services-unwrapping & patterns/services-error-handling