Mavenized and updated to latest RB