Implement modal and make task extendable