Added custom shapes