Added more limitations