Updated properties for better dynamic linking