Moved contented from base to index and added check