Fixed isssue wrt duplicate definitions