Modified for Maven Build and changed Namespace