Added Multi-Core support