Added structure provided by the elementary team folks