Added additional validation. Added further annotations for method delegation.