Added module support (PB 5.20 Beta 6).