Design and translation improvements