Swift modifications