change annotation implementation, fix problem with eclipse integration