Moved common parts to base-template