Fix bugs

Contact update
Provider update
Base update