properly using field abstractions from common
fixed the order on the id vs int