New annotation commands system
Fix merge issues