Added typed variables and struct declaration