Relocated count to sub-module