Little more work on base template