Make bay create work with new bay model structure

Change-Id: I70a0aaa4efe01e3359c402db355fde6dac045dd8