Added prompt support