Modify data if Client status is not UNACTIVE fix #14
Temporarily access improvements #15