Added session variables back to build