Add fields as specified in Issue 13

Made the changes associated with Issue 13.