[#27] Address validations added