Issue #20 and #9: Adding View Support