Added more beta features