Making application more stable