Updated for language changes
API has removed implicit unwrap