Fixed hidden deadlock issue. Added additional customer API functions