Expand model to support opdracht2