Added tasks and removed static methods