Add missing imported packages
Fix wrong ID issue