** Removed @Override from resolveEntity on UserEntityResolver