Refactored LookUpField and window