Adding Task and Message functionality.