Fix legacy schema support syntax

This pull request fixes legacy schema support syntax. While checking #494 then found there are other fixes necessary. Thanks @brunopgalvao