Added few more annotations and made others more specific for Ville.