Implemented SDMF31 table optimalisations