Add updates and refactors