Updated build compatibility