Added the ability to complete IDs