Reworking of setup flow and addition or relations library