Add support for properties, rateLimit, times