Added views, validation