Few generic changes :p