@almazkaist please also add validation