Adding no dock support