Use builder pattern for model + Fixing webapp