Fixed Enhanced type to match the requested type