Classes rewrite, added new wokers