Added more to Bug Control