Processing queue added. Light refactoring