3.0.1 - Code rebase