Refactor to be more backward compatible