Added the @directive to skip optional parts

Change-Id: I06d507dc0f5d9e00ec1ed4a7c857ae194df1c11c