Updated to validate agains aapt