Enhance current
Using module or create