Issue #1: Refactor bean validation