Fix issue for adding user-defined annex