new support for logout and dynamic store blocks