Updated build to support simulator builds