Added structures to prepare for function calls