Replaced implementation list by a table