* Further refactoring