Few refactors and limit option available
Bump version