Extending the HPC2 framework capabilities for heterogeneous computing