Added geometry support to base shader