lookup-tables not hardcoded anymore (+ add '{}')