Refactoring to use my base image