Update to use Maven Annotations

Why did you remove this?