Added basic shapes implementation