Refactor a bit more in Base.java