Refactoring, added buildings update job
Buildings issue fixed