Proto HP management - First commit