support for limit
APIv2 support
stupid mistake with static property fixed