Added AFC2 support (and beginning to fix start_service())