Updated for FloraJS 2.0