Added deplacement support