Changes after ZfcUser integration