Implemented support for disc
Disc support etc