feature 1664: Work on System tables