add pre/post support + only executable indexed