Add support for existing prop points. Further redesign.