removed directive and @NotNull constraints