Further refactor