Implemented more sensors