Added scaffold for both models