Removed static, defined namespace