Updated for docker compatibility