Shorter message code, add engine/prop type info