Added partial UCI support