#1859 + @Machaba-Machaba - Refactoring and added new class to have common components between collection