Added dynamic point generation