Added support for getting primary and foreign keys