First step towards a cleaner wizard
Extract service