Refactor sp type and charge type in domain object.