[Core] - Added really basic handling