Improved Engine Conversion

Added Table Engine detection ...