Improve Status Class