Added some model and post logic