Add ajax to improve perfs