Added event load from web service + some refactoring