Classes: Added warning span where necessary