Now stores custom sensors correctly