All annex functions now works correctly together with DB.