Implement Jamine 2.x branch part