Add accesses and proper exception handling.