Add some validations to Core and UI project