Features/better generators system