Add description and fixme fields