Added Basic Elements
Fixes to Base structure