added prebundle support