Adding core-elements as dependency
cleaned up