Added assembly validations