#30 Better support for security tasks