Added RagNumbers support