Updated mapper to exclude keywords from saving