Added forgotten fields