Change data structure and add more options