PIM-3321: Added new abstract class
PIM-3321: fix cs