Refactoring
Added simple kicker service