COMMANDBOX-24 Update completor to allow static and dynamic additions