add full service
fix compilation issues