Changed some annotations