Update to use async ajax and improve performance