Add motion detection class and other