Removed namespace and added modes