Refactor: use validated decorator