fix some Integer to Int type in method signatures
fix merge conflicts
add support for multitenancy