This document is a master’s thesis analyzing an automated fuel pump management system. In the first chapters we take a general overview of the system and the main problems that we will be facing during the planning and design phases of the project. Later we propose and analyze possible solutions for these problems. Technical system information is revealed in the later chapters. Functional and non functional requirements are discussed along with the main UML diagrams. The research phase of the thesis provides detailed system analysis and software quality reports which later are used to create proposed changes to the system. These changes are analyzed, designed and coded in the final - experimental part of the thesis. The main proposal is to convert the system architecture from flow driven to event driven. This change helps to solve several uncovered architectural problems as well as improve the general quality of the system. These changes are tested and analyzed in the experimental chapter of the thesis and finally the conclusions are made. The main conclusion is that the proposed architectural changes were chosen correctly. This is also supported by the experimental data.