Fixed so that generatedvalue annotation is created