Updated for Spring 14 VM