Refactored elements package