Fix disk-subscriber and optimize code