Converted some imported props into models.

Increased the awesomeness