Fixing relationship chooser
package changes