Eliminating BSM\Image dependency