Enhance inputs behaviour