Refactored bitmap indexes