Encapsulated sizes and added missing inlines