Update loading code to work with Composer

Change-Id: I9159179855e6cd099e725fe67185caa5271bc1ee