Fixed Type
Added Infrastructure Automatization