modules access support
Merge branch 'raysmond'