Added Combinable / Refactoring