Extracted more elements into separate file