Updated for Injectionmap 1.5.4