Added generators and property editor