Improved the extended features