Modified to use EnahncedResponseWrapper