New planned methods, cleanup, error handling, ...