Added global and defaults block generation