Update generic relation import for container and sample
Update docs