Issue 72 - Refactoring common code with issue 111