Updating to use EDX-Core