Removed some unnecessary code
Added Infrastructure