Add some build magic