Added required argument checks