branches/fault: code refactoring using casros accessor