Some added and fix on out of service feature