Separate address model + forminterface improvements