add source field resolve #5, add status property resolve #6