Implemented support for docking