Add lib + add manual task support