Added few more limits