Using module calls, fixed import issues