Added missing fields

Added missing fields. Key is now optional.