Updated Generate and Re-added hoooks