Optimization: changes int sensor module and devices module