Updated to work with pods