Added web logic and system services