Updated bitmap manager