Add less engine support and test