Added class views and forms