Version 2 updates

Fully tested with ColdFusion 9