Added more lists and services for debugging and cleanup purpose.