Added small functionality