Halfway implemented the new interface
fixed supported_entry form