Updated references, added package restore