Adding registration tables, #35