Seperated updates and enhanced code structure