HC drugs entity provider and variable factory added