Add missing descriptions & remove date handler