Added disk support