Somehow missed allot of required changes.

Somehow all changes made for making multi-instance feature optional were missing.
This commit fixes that ( atleast it should )