Some better annotation