Added manual invocations for certain use-cases.