Teacup related changes