Additions for MVC support