Code refactoring to help implementing #3