Added annotations and test example