Added data structure, needs integration into commandhandler