Added additional control structures