Changes and updates following the fi-security layer addition