Refactor SBT container a little bit