WIP - Defaulting values for factories