Updated image ref handlers