Refactored: change type for status,type fields