Configure the General Activity to accept and record both time and calories, as well as having an editable place to record the activity type. This would then cover all the activity types that are not listed.