Implementation of generic related object map generator and tests added