Feature/table for key values