Refactored namespace for instances