Towards Effective Device-Aware Federated Learning