Fixed #21 AppilcationData datastructure and naming