Added core data structures