Made view more polymorphic