Added the rest of the fields

Signed-off-by: Eric Finlay <enfinlay@gmail.com>