Refactored imageids