Implemented new program architecture (Listeners)