Added maps and updated sizing