Adding handling for code elements; closes #58