Improved site model to update favion and site fields