Got more samples working
PMC-20077 - start implementing id resolver