Re-Implemented engine groups