Handling of optional sections was added