Bumped version, fixed @Optional