Adding variable declarations and calls