Enhancement: Structured the dummy according to MVP