Product Management schema tweaks