#264: Added limits to the app