Enhance init