Adds service parsing, thank you Joey Belans