Refactor bird initialization
Add bitmask category;