Added entity packages, etc
Small change to use entity get relationship pattern