Removed hardcoded defaults