Adding bug fixes and new relationships