Moved fief commands to the new system and improved formatting