Add in basic image support