Updated for 1.0 RC-2