Added and Cleaned up pins scaffold