Fixed @Support annotations