Updated models and PuSH notification handler