Use spring and fix some actions