Fixed examples to use entity interfaces