Revert "Use annotation"

This reverts commit 6b89a8b6c07b26905eb879e4cddbcabf1258ba5a.
Use annotation