epoc: Attempt 2 for adding generic device support