added service building and removing