Added basic prop protection