Improved One to One or Many Field