Now doing const and more attributes properly.