Working on rights integration