Data structures + minor changes

Added some data structures for further purpose ...