added framework support