Removed namespace check