fixed primitive modules
add usage of instance for every used method