New draft version without extensions but with additional features