Remove enum for type
Update functions for Task class