Added Analytics feature
fixed crash