Added infrastructure for future methods.