Refactor the engine traits in sbroad