Add property declarations and make value exports unique