Better initiator and feature detection