Added more stuff to features