Change init code to use SYNC version of the modules