Added intial data structures