Added more functions to status generator