Extended One-Factor Short-Rate Models