UI and dependency related changes