Added generic body