Added animation and view classes