Update application flow / encoding structure further