Move flag to session refs #49