Enhance entry form