Added new things for master