Some updates to basic skeleton