Simplification of the application logic