Architecture revamp:: generic class added