merged packages and added validator