Removed hardcoded values for deployment