Improved core command registration, now works via @CoreCommand