Added somethings in beta branch