Refactor code for Base 0.3.0