Adjustments on Applications, Storage and application-client