Some API cleanup and added wildcard block type