Resolved merge conflicts

Added missing function and extends Model to Task and Componenet