Fix #11, Improve shipping repository and fix template inheritance