Fixed consumer synchronization issue + Cosmetics