ISSUE #3. Created some validation rules, but it needs to be common for all bundles