Database layer now accepts args and kwargs