Updates & Refactor