Add support to store limits