Trying to get around entity loading issues