More update - better mappings and now with logging