#125 Split code into a separate table