Remade Service and fixed crashes