Improve perfomance on tasks
Update PO/MO