updating for changes with hooks and changes for spring sec 2.0RC2