Switched to tables for params