Initial implementation with dump support