Updated for proper build path