Start adding support for master version